From 58dd95fbc57d4c17939dc08ddbd5ceeba1ca089f Mon Sep 17 00:00:00 2001 From: "Jan D." Date: Sun, 7 Oct 2012 13:09:04 +0200 Subject: [PATCH] * nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506). --- src/ChangeLog | 3 ++- src/nsterm.m | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 00a05d4dd88..440e510fddb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,9 +1,10 @@ 2012-10-07 Jan Djärv + * nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506). + * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of MAC_OS_X_VERSION_10_6. (syms_of_nsterm): Remove comment about Panther and above for ns-antialias-text. - * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove. (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4. (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3. diff --git a/src/nsterm.m b/src/nsterm.m index d6689c08aa2..6b739befeeb 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2975,8 +2975,10 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) { #if !defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 NSRect dr = NSMakeRect (x, y, s->slice.width, s->slice.height); + NSRect ir = NSMakeRect (s->slice.x, s->slice.y, + s->slice.width, s->slice.height); [img drawInRect: dr - fromRect: NSZeroRect + fromRect: ir operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES -- 2.30.2